commit ef87ff6680f79362a431db6e7ef2f40cfc576219
author Matúš Kukan <matus.kukan@collabora.com> Fri Mar 14 09:42:02 2014 +0100
committer Matúš Kukan <matus.kukan@collabora.com> Mon Mar 17 20:38:20 2014 +0100
tree a1817c09311cca77e44c62f51f253c588a25352b
parent c5630fed3b30f6d5fd0b2692cd96e34e419f9a6c

fdo#51819: autorecovery: fix saving password in protected documents.

Thanks to sayt@mailinator.com for the idea.

Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c

framework/source/services/autorecovery.cxx

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 980e92b..4ebd694 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3233,9 +3233,11 @@
    // if the document was loaded with a password, it should be
    // stored with password
    utl::MediaDescriptor lNewArgs;
    OUString sPassword = lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), OUString());
    if (!sPassword.isEmpty())
        lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
    css::uno::Sequence< css::beans::NamedValue > aEncryptionData =
        lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA(),
                css::uno::Sequence< css::beans::NamedValue >());
    if (aEncryptionData.getLength() > 0)
        lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= aEncryptionData;

    // Further it must be saved using the default file format of that application.
    // Otherwhise we will some data lost.